bitkeeper revision 1.1159.274.1 (42433164m51bkJUX_X_oXhp9fyHXlA)
authorxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Thu, 24 Mar 2005 21:30:12 +0000 (21:30 +0000)
committerxenbk@gandalf.hpl.hp.com <xenbk@gandalf.hpl.hp.com>
Thu, 24 Mar 2005 21:30:12 +0000 (21:30 +0000)
Merge http://xen.bkbits.net:8080/xen-2.0-testing.bk
into gandalf.hpl.hp.com:/var/bk/xen-2.0-testing.bk

1  2 
.rootkeys

diff --cc .rootkeys
Simple merge